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

Change-Id: Ia9a05c0fe59c2677029fcfc95b1cd648c091d23f