Merge "Keep custom keep-clear Rects if preferKeepClear is set" into tm-dev