Merge "Modify bookmark shortcuts for platform alignment" into main