Bug 967516 - Part 1 - Decouple screen timeout from device debug config r=ochameau
Merge pull request #23693 from KevinGrandon/bug_967516_part_1_screen_timeout

Bug 967516 - Part 1 - Decouple screen timeout from device debug config