Merge "Update shortcuts."