Merge "Fixes crash when tap on nav bar without using quickstep"