Merge changes I227d8e0c,Ided4415a into rvc-dev

* changes:
  [incfs] Small cleanup in staging -> final dir rename
  [incfs] Use MountRegistry to import existing mounts on start