Merge "Improve stability on pre draw detector"