Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev