Merge proposals dependent on lp://qastaging/~fboucault/gallery-app/remove_sdcard_during_load

1. remove_sdcard_during_load
2. Dependent merge proposals