Merge "Update SettingsPanel UI"