Merge "Fix case where shortcut label wasn't updating"