Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev