Merge "Move upload/download image action to right place"