fix #2634: NPEs in ImageSelectActivity

* avoids 4 different NPEs
Merge remote-tracking branch 'origin/release'