Merge "change icon name of NFC patchset2. upload 2.0_beta branch" into 2.0_beta