merge in ics-mr1-release history after reset to ics-mr1
tree: e56345ffeb4157b9499436493c2e1b89d913ee17
  1. libvideoeditor/