Merge "Revert using DeviceUnlockedInteractor for Compose bouncer." into main