Prefer to use Array.prototype.includes() for some of Array.prototype.indexOf()

Coming from 📌 Use String.prototype.includes() instead of String.prototype.indexOf() where necessary Fixed this change already seemed to be accepted so this seems fine.

small detail

I changed to simple else clause in my local environment, it seems to work correctly.

Feedback fron @nod_ appears to be addressed.

Thanks for the update. When reviewing with the full context, it makes sense to have the else if, can you add it back please?

I reverted else to else if.
Please review.

Revert was fine.

nod_ → closed merge request !8381

Committed and pushed 0819b7aaf4 to 11.x and 530cf173e4 to 11.0.x and 6f61856980 to 10.4.x. Thanks!