fix disposed widget
Merge remote-tracking branch 'origin/master' into FT2427_RepairAPI
fix merge