Merge "Empty notification shade state." into lmp-dev