Merge "Fix action menu visibility callbacks for nested popups" into klp-dev