Merge "Add navigation bar button logs" into main