Merge "Maintain property collapse/expand across frames." into main