Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs