Merge "Remove warnings in recordvideo"