Merge "Add displayPresentTime to getFrameTimestamps"