Merge "Fixing a couple nav bar crashes" into sc-qpr1-dev