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

Change-Id: I8cf85702e2828fe9a8ff53dd476c080a3f99c61b