Merge "Fix NPE in zeroJankProxy resultReceiver" into main