Merge "Use ImeAwareEditText in FingerprintSettings"