BHV-15157: Handle a few additional edge cases, prevent nulled styles from appearing.

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>