Merge "Fix keyboard remain after dismissing notification" into sc-dev