Merge "DeviceConfig for Chooser update-delay duration." into tm-dev