You could use Simple Brightness applet, it has option to keep display on, when ever phone isnt locked manualy.