Merge "Revert "Revert "Load app images"""