Merge proposals dependent on lp://staging/~codygarver/pantheon-files/fix-1087694

lp://staging/~codygarver/pantheon-files/fix-1087694 has no merge proposals.