Merge "Revert "Use same display for activities in same process.""