1093874 2nd attempt

New pull request created for Bug 1093874, reverting dummy filechange commit
Can we add a check here that there's a picture file present, though it is not displayed in Gallery app?
<code>self.assertTrue(len(self.data_layer.picture_files) == 1)</code>