Merge "Fix Bitmap#sameAs NPE" into mnc-dev