fix view dispose issue.
Merge branch 'master' into master-github