Merge "VolumeShaper: improve logging and dumpsys" into oc-dev