Fix an issue that could cause recent menu item not work
Merge remote-tracking branch 'origin/dev-internal'