Merge "CameraHardwareInterface: Reconnect preview in HAL set_buffer_count" into nyc-dev