Merge "Hiding launcher shortcuts" into main