Merge "disable test for user dictionary settings" into gingerbread