Merge "Move Checkpoint commit to finishBooting"