Merge "Revert "flip app shortcut popup design on for U"" into udc-dev