Merge "Code cleanup and disable display lists for now."