Merge "Avoid resuming same activity twice"