Merge "Do not umount roofs even if it is R/W."