Merge "camera_proxy: Remove @hide NFC API usage" into main