Merge "Add navigation bar/secondary handle visibility logs" into main