Merge "Revert "Deprecate Activity#isChild/getParent"" into main