Merge "Clamp EditText cursor in the drawable boundaries." into nyc-dev