Merge "Fix some issues with TwoButtonNavbarTouchController"