Merge "Handle video track with invalid WxH to avoid mediaserver crash" into main