Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575ff9
am: 90ad7d538f

Change-Id: I524cc9f1c547b85dff3e726082aba52e255e9ccc