Merge "Removes "reset" button from shortcuts screen." into tm-qpr-dev