Merge "Camera2: minor style update" into lmp-dev