am cae88c80: Merge "Close photo selection activity on config change" into jb-dev

* commit 'cae88c80de75d24359125051b60b0c3f00fcfdb1':
  Close photo selection activity on config change