Merge changes I2c1d4b42,I06fe4d33

* changes:
  Conditionally use sdcardfs.
  Also delay creating found disks until user 0 is started.