Tweak to remove obsolete logic (and fix joined-panel case).

Enyo-DCO-1.1-Signed-Off-By: Gray Norton (gray.norton@lge.com)