Merge "Add support and better exceptions for Bitmaps with a null config." into jb-mr2-dev