Merge "Fix re-entrant issue in Keyguard / Mixed handler" into udc-dev