Merge "Make changes to testapps to split a callback" into pi-dev