Merge "Restored selectAllOnFocus"