Merge "Remove unecessary code from ActivityStack"