Merge "Camera: Add support for hidden physical camera ID"