Merge "Adding a setting to force user activity." into nyc-dev