Don't restart timer if still in locked state
Make sure keypad doesn't stay up when exiting view