Merge "Tweak dialog layout of EditTextPreference" into tm-dev