Merge "Fixed several bugs with the notification shade" into lmp-dev