Merge "Fix jank when switching themes" into oc-dr1-dev
am: a74f575ff9

Change-Id: Ibc8fa59cfa6139b03aa7fb08361eb43331484be5