Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev