Merge "Fix crash in getParentContainerBounds" into tm-dev