Merge "Fix issue with touches falling through nav bar in 3 button nav" into tm-qpr-dev