Merge "Move bitmap saving into corresponding ShortcutPackage" into tm-dev