Merge "[DO NOT MERGE] Emergency button text should use sp, not dp" into tm-qpr-dev