Merge "More targetted drawFinished fix"