Merge "Add dedicated flag to control app image generation" into pi-dev