Merge "Prune image cache if the boot marker is still in place." into lmp-mr1-dev