Merge "Fix build: Revert "Enable/disable hardware rendering on windows by application tag""