Merge "Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay" into klp-dev