Merge "Add an invisible layer to trap focus" into sc-dev