Merge "Reland modify bookmark shortcuts for platform alignment" into main