Merge "Preventing GH container from being focusable if bouncer is on screen" into main