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

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