Merge proposals dependent on lp://staging/~hyuchia/pantheon-files/fix-1124209

lp://staging/~hyuchia/pantheon-files/fix-1124209 has no merge proposals.