Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev