Merge "Use the correct handler when persisting the settings state." into nyc-dev