Merge "[Expressive design] create helper class on the device." into main