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