Merge "Fix native permission helper local call handling"