Merge "Don't use dp for lock icon padding" into tm-qpr-dev