Merge "Fix NPE in decodedBitmapDrawable" into lmp-mr1-dev