Merge "Add flag for controling app image generation" into pi-dev