am 90f59bf9: Merge "Re-enable frame dropping for non-auto timestamps" into klp-dev

* commit '90f59bf9eba79b27629505bc2709d84e7c811c8b':
  Re-enable frame dropping for non-auto timestamps