Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev