Merge "Vector: Restore collapsibleNav design improvements"