Fix NPE in PhotoModule (2nd half of commit that's getting axed)

this seems unrelated to the other commit, anyways.

Revert "Add storage selection (2/2)"

This reverts commit 59a01f98d8341447d336a03ad49f4702b17b93a2.

Change-Id: I7cf92bf6c8c7a59a6584aa608a6b0fcf521cab01