Merge "Fix View leakage from mPreSortedChildren" into nyc-dev