Merge "Fix getFrameTimestamp test flakes."