Merge "Fix recursive initialization on app image."