Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev