Merge "Allow nav bar to consume touch events based on configuration" into rvc-dev