Merge "Revert "Disable app images for now""