Merge "Revert "Swipe notification to edge of screen"" into sc-dev