am e5c06198: (-s ours) am 23cbeb79: DO NOT MERGE remove save/restore picture from browser app

Merge commit 'e5c06198330df7c57cc4e04db068629765ecb32c'

* commit 'e5c06198330df7c57cc4e04db068629765ecb32c':
  DO NOT MERGE