Merge "Guard the camera workaround with a targetsdk check" into rvc-dev