Also, move visibility stuff from onResume to onCreate (they are only affected by preferences, i.e. onCreate will always be run since the preferences button is only in our main activity).
6e622e59ab