Merge "Camera: Reconnect after camera service crashes" into mnc-dev