Merge "Fix navbar position assertion" into main