Merge "Add density requirements for watches" into mnc-dev