Merge "Fix shortcut rotate trigger swipe notification" into sc-dev