Merge "Stabilize hidden API lists" into pi-dev