Merge "Reduce log spam when unmounting /data"