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

Change-Id: Ide35fd3cf01a26168e4b208bcec39b0251e608f8