Integrate some of @achinthas edits from https://github.com/FindingSimple/acf-field-video/pull/2