Merge "Fix 3315401: Prevent pattern confirmation screen from asking twice"