Merge "Round bottom corners for notif before shelf after swipe ends" into sc-dev