Merge "init: Make sure ImageManager status files are labelled."