Prepare for next release
Improve Drawable to Bitmap conversion