Revert "Revert "Add storage selection (2/2)""

This reverts commit 27f80c30596362e2f9a3e2045068fdd6c2f9a168.
Fix activity stack when restarting the screen nail

We were stacking multiple activities, resulting in the need for multiple
destructions (back key events) when killing the camera app

Change-Id: I7ec61c517d25f7e47baf47fcd1696f987631c344