Rewrite API 'paction' switcher as an actual switch

Change-Id: I1f10ee890ea5d1d709739b21c23e35a6a6fd4901
Merge "Rewrite API 'paction' switcher as an actual switch"