Merge "Go to root  from child directory when root tapped. Bug: 27060001" into nyc-dev