Merge "Add more logging for onHeaderClick(...)"