Merge "Fix crash in Monkey test." into pi-dev