Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget"