Merge "Fixed leak of cross user data in multiple settings." into sc-dev