Merge "Make finish() a no-op on a context mode that is not active."