Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev