Merge "dynamic shortcut label/icon retrieval for app launch shortcuts" into main