am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev

* commit '6c3a468cf32926d3ad990fc7bc44e8b04615a7f2':
  Avoid use-after-free race condition when rebasing theme