Merge "Fix stale EditorInfo upon EditText#setText()" into sc-dev