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