Merge "Ensure bubbles + pip dismiss view is above navbar" into sc-v2-dev