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

Change-Id: I7e833b282939153d63fc2ffbeb8d5cb77923b62d