Merge "Camera2: Reconnect camera service for listeners" into nyc-dev