Merge "Get application info in the correct user id" into pi-dev