Merge "Fix null pointer exception when surveys are turned off"