Merge "Guard one more use of CentralSurfaces in NavBar" into tm-qpr-dev