Merge "Update OWNERS for shortcut manager" into main