Merge "Fix for crash in PathBarLayer::recomputeComponents"