Merge "Making notifications wider in split shade mode" into sc-dev