Merge "Update settings together with framework changes"