Merge "Camera: Correct request settings R&C override" into tm-dev