Merge "Handle disabled state for action menu items"