Merge "Use package context for loading task description icon resource" into pi-dev