Merge "Align mirroring bottom sheet to UX mocks" into main