Merge "Fix bug 5027071 - Action menu parent consistency"