Merge "Fix discard changes show up if apply the shortcut changes" into main