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