Merge "Re-enable frame dropping for non-auto timestamps" into klp-dev