Merge "Revert the change that remove the video layout listener."