Merge "Fixing ShortcutManager Tests after new userproperty" into main