ENYO-16740: Consolidate conditionals, update handler name.

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