Merge "Change the position of addAndGetFrameTimestamps when queueBuffer"