Merge "Add inactivity timer to turn off keyboard backlight"