Merge "Updates following 'Rename BitmapImage as BufferImage'" into tizen