Merge "Reduce NearestTouchFrame size to prevent button taps on nav bar"