Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev