Revert "Fix jank when switching themes" am: 6498f96283
am: 51a1525199

Change-Id: I06187734d198eff410f1b04d2c7c2e491e57e709