Merge "Update System settings content observer to cache values." into sc-dev