Merge "Revert "Camera2Client: handle slower jpeg stream sensor"" into mnc-dev