Merge "Fix NPE in user settings." into nyc-dev