Merge "Update TwoButtonNavbarTouchController logs" into sc-dev