Merge "Only compare the relevant insets for navbar position" into udc-dev