Merge "(bug 34876) improve $.makeCollapsible performance on the initial collapsing"