Merge "Update nav bar insets when in extractView" into udc-dev