Merge "Fixing polish issues with the U app shortcut popup design" into main