Merge "Correctly set the window callback for ToolbarActionBar"