Merge "Fix NPE in FingerprintAuthenticationDialogFragment for MainActivity by having the explicit reference to the Activity." into mnc-dev