I got impatient, so I left gps enabled,enabled airplane mode, rebooted phone, opened maps, disabled airplane mode (not waiting for GPS lock), then opened Maps. Fifteen seconds later, it was locked. That was a couple of hours ago. Opened Maps again just now, and it locked quickly (5 seconds)...