Merge "Prevent possible NPE in android.gesture.Learner"