Merge "[Bug] fix N_SE-9583: Shows NFC On though it is turned off ." into 2.0_beta