Merge "Sensor: use FlattenableUtils::align"