Add never display timeout option

Credit to Slim.

Change-Id: Id335e66ee4dfdf5bbf543963dd95eee54d3ed908