Merge "Sort of port over tests for GeneralPrefsFragment" into ub-mail-master