am 1cf0679c: Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier

* commit '1cf0679c861c280f4bdb801e42ba4882851d3e63':
  Fix for crash when PhotoApp deletes last Cam pic