Merge "Disable NavigationView nested header scrolling" into mnc-ub-dev