Merge "Update VideoState reference." into lmp-dev