Merge "Light grey bugbot updates." into pi-dev