Merge "Prevent activity token leaked to another process" into main