Merge "Revert "Demote TaplThemeIconsTest#testShortcutIconWithTheme"" into main