Merge "Allow overlap between notifications and lock icon" into tm-dev