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