Merge "Shortcut preview update (2/3)" into main