BHV-12188: Re-adding fix for BHV-11579.

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>
Merge pull request #1492 from enyojs/BHV-12188-aarontam-v2

BHV-12188: Re-adding fix for BHV-11579.