Fix activity stack ordering