Merge "Update clear key plugin appData to void*" into pi-dev