Merge "Merge "Fix jank when switching themes" into oc-dr1-dev am: a1f64b0a91 am: 667c29d0be  -s ours" into oc-mr1-dev-plus-aosp
am: 0c52de531a

Change-Id: I6b51fbbb233a523e3e710bfaadf9e36682063962