Merge "Merge "Fix jank when switching themes" into oc-dr1-dev am: a74f575f am: 90ad7d53" into oc-mr1-dev-plus-aosp