Merge "Restore notification stack updates during lockscreen-to-shade" into tm-dev