Merge "Reset mCurrentVideoUri to null before starting recording." into ics-mr1