Merge "Camera: Move bokeh mode to extendedSceneMode tag" into rvc-dev am: 2ecb17aa03

Change-Id: Ic1d15836ecefac7197fde0e3219f5afefb48966b