Merge "Fix MSG_REQUIRE_NFC_UNLOCK case" into sc-dev