Merge "Add more hidden APIs on the light greylist" into pi-dev