Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev