Merge "Video capture is returning a much larger result than specified in android.intent.extra.durationLimit" into jb-mr2-dev