Set file size properly while picking file - part 2
Merge branch 'develop' into filepicker_manager