Merge "Remove hidden VideoState Annotation usage for Mainline"