Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0