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

Change-Id: Ib4b218b511abaa2937d5d451ee0174137c4895c0