Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled."