Merge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev