Merge "BUG-868: stop using getChildren()"