Merge "Fixing notification scrim bounds in split shade" into sc-dev