Fix build.gradle
Clear bitmap when set
Merge branch 'master' into scale-type