Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev