Merge "Increase vertical overlap between notification shelf and lock icon" into tm-dev