Merge "Add more debugging code to track down hang during video recording"