Merge "Increase touch slop for navigation bar gesture"