Merge "fix pie menu handling"