Merge "Camera: Move bokeh mode to extended scene mode." into rvc-dev am: 1939a00071 am: 25d9dd2f15 am: a3d3cde08f am: d7f81626da

Change-Id: Ia58ca70825abf1d8ad4a26ea58bac0652bc0da68