Merge "remount: If checkpoint is in progress, wait for it to complete" into main