Merge changes Idca52b94,I82ae308d into pi-dev

* changes:
  Sort hidden API light grey
  Add more hidden API to light grey