Merge "Revert "Fix jank when switching themes" am: 6498f96283 am: 7f58322d51" into oc-mr1-dev-plus-aosp