Merge "Fixing notifications background in split shade mode" into sc-dev