Merge "Remove gesture shortcut restoration/merge logic from AMS" into main