6d7fcc4b
This fixes painting hangs under diverse situations, while CORE-12071 and CORE-12085 remain fixed.