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

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