Merge "Avoid null pointer exception when calling NotificationShadeWindowControllerImpl#dump" into sc-dev