Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev