Merge "Scroll down to avoid tapping on nav bar" into main