Add never display timeout option

Credit to Slim

Change-Id: I204016a6639effd02bdcfd84a25e321ee959e034
Merge "Add never display timeout option" into jb3