Merge "Update bookmarks.xml shortcuts to specify a role to invoke." into main