Merge "Fix rounded corners for shortcut & generated preview shadow box" into sc-dev