Merge proposals dependent on lp://staging/~jeremywootten/pantheon-files/fix-1625290-crash-on-reenter-directory-init

1. fix-1625290-crash-on-reenter-directory-init
2. Dependent merge proposals