Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev