Merge "Defer resetLockout and execute on a separate thread" into qt-r1-dev
am: a73b532329

Change-Id: I570a522b99adaa66208be83ff6a8f3032054d741