Merge "Reinstate configs from disk across boots by fixing bugs"