Merge "Add multi-window entry points logging"