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

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