Merge "Adding null check for mNotificationShadeView" into tm-dev