Merge "Add track for CollapsableQuickSettingsSTL transition" into main