Merge "Update settings together with frameworks/base"