Merge "Restrict QS container to avoid nav bar insets" into sc-dev