Merge "CSD: add timeout of 20h after momentary exposure"