Merge "Remove NavigationBarOverlayController." into tm-dev