Merge "Ignore mkdirs requests while storage is locked." into pi-dev