Merge "When a shortcut is deleted remove it from xml as well" into sc-v2-dev