Merge "Add null checks for notification shelf" into sc-dev