Merge "Handle bouncer show requests when bouncer is already unlocked" into main