[2/2] Gallery2: Storage configuration

Change-Id: I04351f12770edecfb310ecb401e7801be2994758
merge changes from Omni 4.4 into local branch