This addresses comments in the original PR (#41245) that introduced Intent.doNothing, adds tests, and fixes an issue with it.