Fix for: GF-44306

Root from on https://github.com/enyojs/enyo/pull/562.