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