Merge "Revert "The source of subtree chagnes should be the viewParent""