Merge pull request #9316 from timdream/bug859895

Bug 859895 - Make screen off wifi timeout build-configurable, r=@alivedise, a=tef+