Merge "Fix 5026428: Rework unlock attempt logic with active DPM to show better messages"