Merge "Request focus when EditTextPreference opens"