Merge "Still save config on client side when not reporting to activity."