Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev am: 6cf5ea63eb
am: 42c4a92560

Change-Id: I7edb77a8826d2ba546843d90f150e774a0a5c7c9