Fix navigation problem in layout
Merge from upstream