Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev