Merge "Prevent cleaning up and resuming null activity when task is reparented."