Merge "init: disable watermark_boost feature"