Merge "Add content description to the master switch toggle button." into oc-dev