Merge "Revert^2 "Re-adding logic to hide launcher shortcuts when shade is open"" into main