Add back customizeable active display timeout
Merge branch 'jb43' into multiwindow