Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair