Merge "Move hidden API from vendor to light grey" into pi-dev