WIP fix video recording

Change-Id: Ifc26e9f48b639aa30d658c686dda654a2ee72b8b