Merge "Optimize change detection for tree view"