Merge "Fix bad hidden child recovery" into mnc-ub-dev