Merge "Fixed a ordering bug with the notification shade" into lmp-dev