Merge "Camera2: update the recording duration margin" into mnc-dev