Merge "Revert "Multiple resumed activities""