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