Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev