am 11a8748c: am 6a8c79bb: Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev

* commit '11a8748c43985159ec910832f06ab6299df26787':
  Improve keying for theme caches, rebase system theme on config change