Merge proposals dependent on lp://qastaging/~jeremywootten/pantheon-files/fix-1611022-stop-on-eject-if-possible

1. fix-1611022-stop-on-eject-if-possible
2. Dependent merge proposals