Merge "Revert "Force-enable hardware acceleration for apps""