Merge "Sensor enable/disable added to dvr api"