Merge "Use actual navigation bar insets info to determine position" into main