Fix imagepicker bugs

Test Plan:
<see below>