Merge "Simplifying status management when launching subactivities"