Merge "Wiring video state through from Connection" into lmp-dev