Merge "Do not collapse the shade when clicking the last notification." into sc-dev