Merge "Prevent repeated cursor movements from escaping a TextView"