Merge "Fix MenuItemImpl#hasCollapsibleActionView for action providers"