Merge commit '1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken * commit '1889f40aa17bd658df1b7181d091a6dff631ec95': Make EditTextPreference scrollable.
Merge commit '1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken * commit '1889f40aa17bd658df1b7181d091a6dff631ec95': Make EditTextPreference scrollable.