PreferencesActivity cleanup
Merge branch 'feature/material-appcompat' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat