Merge "KeyguardDisableHandler: make properly user aware"