Merge "Fix display list issue that was crashing an external app."