Switch to new first paint notification in order to avoid errors in some cases