Merge "Add HideNonSystemOverlayMixin for SpaActivity" into main