Merge "Force-enable hardware acceleration for apps"