Merge "Update nav bar window layout params when nav mode changes" into main