Merge "ShortcutManager should support MaskableBitmap Icon type"