Merge "[SF] When content detection is off layer should have NoVote" into sc-dev