Merge "Gallery2: Fix detail dialog image count" into jb-mr2