Merge "Only update mutable shortcuts."