Merge "Handle some edge cases when seeking while starting up OMXCodec"