Merge "Notify user nfc may be blocked after dispatch failed" am: b05eaa5de1

Change-Id: I93c9ecdd74f88a4134b56927220e6ce1ec3d9a03