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

Change-Id: If4e1ae37e07d92a59592dc943aebc6a6940b4f31