Merge "Fixing notifications in split shade when customizing QS" into sc-v2-dev