Fix ActivityStack in MainApp