Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev am: 6cf5ea63eb
am: 8643b456b6

Change-Id: I758f67beaa6950a820b0dc426a217580377df2cb