Merge "Fixing QS expanding in split shade when swipe happens on notifications" into sc-dev