Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev