Merge "Add more capabilities to TestVideoProvider" into m-wireless-dev