Fix bugs 6882711 and 6836814

 Bug: 6882711
 Bug: 6836814

 A number of issues surrounding the behavior after deleting
 the last photo from the camera roll within the Camera app,
 including occasional black screen & incorrectly persistent
 action bar.

Change-Id: Ib5f41a78c613da90bb844aab2d40f45e314d3ee3