Merge "Add another entry to hidden API light grey" into pi-dev