Merge "Set dynamic_sensor_timeout to 1600 during boot" into main