Merge "Ensure no more callback invocations after onBackCancelled" into main