Merge "Change provideContextImage() API to accept Bitmap"