Merge "Fix some issues with TwoButtonNavbarTouchController" into sc-dev