Merge "Fix background data setting being backwords" into nyc-dev