Batch participant status updates still sending unexpected emails

It has long been the case that Batch Updating participant statuses sends out unwanted and confusing email notices. There's been some progress on this with the explanation on the top of the form as to what conditions emails are sent. (see https://issues.civicrm.org/jira/browse/CRM-19429)

However, emails are still unexpectedly sent and contributions processed in the following situation, which is contrary to the explanation at the top of the form. If a participant status has been earlier set to Registered from Pay Later AND the associated contribution is still Pending Pay Later, the participant receives a notice - and the contribution is marked as completed, which is also incorrect.

I can see the benefit to some workflows that registration status and contribution status are both resolved in a single action, but I suspect that many users are like myself and want to treat registrations and contributions independently. At the very least, the explanation at the top of the form should indicate this additional case when emails will be sent.