Bug 843855: reduce the time between unlock tap and unlock transition from 1000ms to 500ms

remove:
 - transition-delay
 - reduce timeout (we're hitting it after 100ms without noticable difference because the transition takes 500ms anyway)
move some function post setting nextFramePaintListener