Merge proposals dependent on lp://staging/~jonoomph/openshot/openshot_timeline

lp://staging/~jonoomph/openshot/openshot_timeline has no merge proposals.