Merge "STT: Read disk size using 1024-byte blocks" into main