Merge "Only persist last Shared Preferences state"