Merge "Fix context submenu position"