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