IMX: Helix ports

Those are backports for Helix. After https://github.com/xbmc/xbmc/pull/5964 and https://github.com/xbmc/xbmc/pull/5963 are in.