Merge "Remove from hidden API light greylist" into pi-dev