Merge "Fixed ApnEditor crash issue" into pi-dev