Merge "Fix jank added by combining shade expansion in QuickAffordanceInteractor" into main