Merge changes I00c3e823,If8bca004

* changes:
  Improved key frame detection.
  Improved KF insertion after fades to still.