Clean up AppBar layouts by merging AppBarCommandsLayout with commandsLayoutMixin