Merge "Don't collapse the Shade when expanding a notification." into sc-dev