Backport !1745 and !1725 from mainline vlc

This backports vlc!1745 (merged) and vlc!1725 (merged) from mainline vlc and adds the podspecs updates missing from the previous betas.