cherry-pick: TEMP - remove button-backlight inactivity timeout
* rebased