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