Merge "Removed always running preDrawListener"