Merge "mw.toolbar: Clean up the API of the classic toolbar."