Merge "Traverse layers in update order" into jb-mr2-dev