Merge "Camera: Update test for migration of BOKEH_MODE" into rvc-dev