Merge "Fix editText can't focusable issue"