Merge "Add third video to default system videos." into ics-factoryrom