Merge "ActivityStack cleanup"