Merge "Make settings button touch target size larger" into tm-qpr-dev