Merge "Add more hidden API uses to light greylist" into pi-dev