Merge "Add setting to disable PIN animation and password" into tm-qpr-dev