Merge "Correct used size of Storage Settings." into udc-d1-dev