Merge "fix [2542425] memory leak during video recording" into froyo