Merge "Camera: Fix up STREAM_CONFIGURATION_MAP doc" into tm-dev