Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575ff9
am: 902ba7bab5

Change-Id: Icd8f2b020170e16134947dfd5fdeb4291e9f231c