Merge "Fix BitmapDrawable outline crash" into lmp-dev