Merge "Fix an issue that the sensor privacy does not apply to the new camera clients"