Final commit for Android duplicate canvas issue.