Merge "Fix expanded notifications on lockscreen" into lmp-dev