Merge pull request #948 from musashino205/wifi-fix-disp