[ios/atv2] - another damned auto-merge conflict - squashme