Merge "Tighten restore-at-install behavior" into lmp-dev