Merge "Skip children in fixupAppData() when parent shady."