Camera: Move storage settings under second menu

Fix layout issues like this: http://i.imgur.com/XvJz5Pk.png

Change-Id: Ia641cc524266eef0edbcce851707b1a48b1490bd