Merge "Add VideoState member variable to InCallCall." into lmp-dev