Merge "Remove opaque-on-interaction from nav bar." into klp-dev