Merge "Temporarily workaround merged bitmap bug"