Merge "Make sure to remove NotificationShade surface when keyguard went away." into sc-dev