Merge "Fix bug #15414236 Define a framework theme for system settings"