Merge "Add logs to help debug TwoButtonNavBarTouchController" into sc-dev