Merge "Make user notification update and auto cancel" into sc-dev