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

Change-Id: I8106b0690ca56707c5943a650b8245a2f83aa904