Merge "Fix entry bounds for 3 button nav" into tm-qpr-dev