Merge "Correct the way settings deals with subscriptions."